js: Adapt to GSettings API change

The 'schema' property has been deprecated for a long time. Even though
this will likely be reverted in glib, let's stop using it.

diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js
index e77ac66ff04da4def440b5603642a570a2896821..586bad16905d18ee9438dc64fbc165954c643af7 100644 (file)
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -278,7 +278,7 @@ const ExtensionRow = new Lang.Class({
 
         this.uuid = uuid;
 
-        this._settings = new Gio.Settings({ schema: 'org.gnome.shell' });
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
         this._settings.connect('changed::enabled-extensions', Lang.bind(this,
             function() {
                 this._switch.state = this._isEnabled();

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 47410ef670b3cf76933abdd140bdca4c8f6e760b..18df8f95ed00911bfb6832649bd51e45f518ca8e 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -382,7 +382,7 @@ const LoginDialog = new Lang.Class({
                                   Lang.bind(this, this._onTimedLoginRequested));
         }
 
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                                Lang.bind(this, this._updateBanner));

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 678b3baa79f71739bc79f14741ffdd8cfa0bf538..c9d205502a5e7b59ea290ebe6cb72865c26d1b8f 100644 (file)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -128,7 +128,7 @@ const ShellUserVerifier = new Lang.Class({
 
         this._client = client;
 
-        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
         this._settings.connect('changed',
                                Lang.bind(this, this._updateDefaultService));
         this._updateDefaultService();

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index fc7a558cc2124262e23de920d19021d92fb31ea8..4960b55be5c377ff23a497b56bea55cf71c5225e 100644 (file)
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -367,7 +367,7 @@ const WindowSwitcherPopup = new Lang.Class({
 
     _init: function(items) {
         this.parent(items);
-        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
     },
 
     _getWindowList: function() {
@@ -456,7 +456,7 @@ const AppSwitcher = new Lang.Class({
         this._arrows = [];
 
         let windowTracker = Shell.WindowTracker.get_default();
-        let settings = new Gio.Settings({ schema: 'org.gnome.shell.app-switcher' });
+        let settings = new Gio.Settings({ schema_id: 'org.gnome.shell.app-switcher' });
         let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
                                                                        : null;
         let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 2f2ad026802379d4dfc9fddb4ccb1076a6cfc1f9..d4231290e2607db5d0d6898d819ad75d71931c67 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -371,7 +371,7 @@ const AllView = new Lang.Class({
         Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, function() {
             Main.queueDeferredWork(this._redisplayWorkId);
         }));
-        this._folderSettings = new Gio.Settings({ schema: 'org.gnome.desktop.app-folders' });
+        this._folderSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' });
         this._folderSettings.connect('changed::folder-children', Lang.bind(this, function() {
             Main.queueDeferredWork(this._redisplayWorkId);
         }));
@@ -741,7 +741,7 @@ const AppDisplay = new Lang.Class({
     Name: 'AppDisplay',
 
     _init: function() {
-        this._privacySettings = new Gio.Settings({ schema: 'org.gnome.desktop.privacy' });
+        this._privacySettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.privacy' });
         this._privacySettings.connect('changed::remember-app-usage',
                                       Lang.bind(this, this._updateFrequentVisibility));
 

diff --git a/js/ui/background.js b/js/ui/background.js
index 284c4882ba534c6967a607fcb3f57d58fa81fef3..3cdc7ef375ac7214cfa9d9b2761c492df2f4bd96 100644 (file)
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -725,7 +725,7 @@ const BackgroundManager = new Lang.Class({
                                         controlPosition: true,
                                         settingsSchema: BACKGROUND_SCHEMA });
 
-        this._settings = new Gio.Settings({ schema: params.settingsSchema });
+        this._settings = new Gio.Settings({ schema_id: params.settingsSchema });
         this._container = params.container;
         this._layoutManager = params.layoutManager;
         this._effects = params.effects;

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 438c89a5f52815c564a04f4b4d965cc4f38ca69b..4453de8f69069dd1bbbc8240ea22bb06b1c17c12 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -383,7 +383,7 @@ const Calendar = new Lang.Class({
 
     _init: function() {
         this._weekStart = Shell.util_get_week_start();
-        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.calendar' });
 
         this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
@@ -704,7 +704,7 @@ const EventsList = new Lang.Class({
                                      layout_manager: layout });
         layout.hookup_style(this.actor);
         this._date = new Date();
-        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
         this._weekStart = Shell.util_get_week_start();
     },

diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 531d59dc9e66d37f7db8f581b3258b0c263f9634..84dc47c5f36bb98e01e38ef20dbf25ff5386b2e0 100644 (file)
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -23,7 +23,7 @@ const AutomountManager = new Lang.Class({
     Name: 'AutomountManager',
 
     _init: function() {
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
         this._volumeQueue = [];
         this._session = new GnomeSession.SessionManager();
         this._session.connectSignal('InhibitorAdded',

diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 66077cbf3ebcf1b3296e322b562005624bc7f5c9..8f716cced677865fa4a3d2c99f786b2e4c8e5683 100644 (file)
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -96,7 +96,7 @@ const ContentTypeDiscoverer = new Lang.Class({
 
     _init: function(callback) {
         this._callback = callback;
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
     },
 
     guessContentTypes: function(mount) {
@@ -441,7 +441,7 @@ const AutorunTransientDispatcher = new Lang.Class({
     _init: function(manager) {
         this._manager = manager;
         this._sources = [];
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
     },
 
     _getAutorunSettingForType: function(contentType) {

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index 63ca776fa15b7b7f3316664ea0df4ba597260724..320eb4a144cdffa8594870fe2dc41c07b6f91bd7 100644 (file)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -946,7 +946,7 @@ const ChatNotification = new Lang.Class({
 
         let format;
 
-        let desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        let desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
         let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
         let hasAmPm = date.toLocaleFormat('%p') != '';
 

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 62147c751818a1cd83bc340185fc71f2758c554b..244b1d172ae2532a938561893d55c0c10274831a 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -161,9 +161,9 @@ const Keyboard = new Lang.Class({
 
         this._timestamp = global.display.get_current_time_roundtrip();
 
-        this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
+        this._keyboardSettings = new Gio.Settings({ schema_id: KEYBOARD_SCHEMA });
         this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
-        this._a11yApplicationsSettings = new Gio.Settings({ schema: A11Y_APPLICATIONS_SCHEMA });
+        this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
         this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
         this._settingsChanged();
 

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index a39d713a7492286ba4bbc0e0d1267110875ed077..eb837d89cdbf4fc551c1de8c9a3c7042398f1647 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -797,7 +797,7 @@ const LookingGlass = new Lang.Class({
                                         reactive: true });
         this.actor.connect('key-press-event', Lang.bind(this, this._globalKeyPressEvent));
 
-        this._interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._interfaceSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
         this._interfaceSettings.connect('changed::monospace-font-name',
                                         Lang.bind(this, this._updateFont));
         this._updateFont();

diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 6493aff701c2903fa2836beb439b709a01297ce8..ccbf8cda4787ee37a37842169c380a5e8d11ad6c 100644 (file)
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -441,8 +441,8 @@ const Magnifier = new Lang.Class({
     },
 
     _settingsInit: function(zoomRegion) {
-        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
-        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
+        this._appSettings = new Gio.Settings({ schema_id: APPLICATIONS_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });
 
         if (zoomRegion) {
             // Mag factor is accurate to two decimal places.

diff --git a/js/ui/main.js b/js/ui/main.js
index 6218f33d5c6064c350d6664461ccc901868fad2f..e4872500ac3b698049474721b23eb1cc5efa967e 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -160,7 +160,7 @@ function _initializeUI() {
     layoutManager.init();
     overview.init();
 
-    _a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
+    _a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
 
     global.display.connect('overlay-key', Lang.bind(overview, function () {
         if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 770d46bdf8553d9d25983306c6cf4ccb6942510d..92135f980ce4c96efdfd3a5ec83b0718cd22f08b 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -315,7 +315,7 @@ const NotificationGenericPolicy = new Lang.Class({
 
         this.id = 'generic';
 
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        this._masterSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications' });
         this._masterSettings.connect('changed', Lang.bind(this, this._changed));
     },
 
@@ -365,8 +365,8 @@ const NotificationApplicationPolicy = new Lang.Class({
         this.id = id;
         this._canonicalId = this._canonicalizeId(id);
 
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
+        this._masterSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications' });
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications.application',
                                             path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
 
         this._masterSettings.connect('changed', Lang.bind(this, this._changed));
@@ -1900,14 +1900,14 @@ const MessageTray = new Lang.Class({
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
 
         Main.wm.addKeybinding('toggle-message-tray',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
                               Shell.KeyBindingMode.NORMAL |
                               Shell.KeyBindingMode.MESSAGE_TRAY |
                               Shell.KeyBindingMode.OVERVIEW,
                               Lang.bind(this, this.toggleAndNavigate));
         Main.wm.addKeybinding('focus-active-notification',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
                               Shell.KeyBindingMode.NORMAL |
                               Shell.KeyBindingMode.MESSAGE_TRAY |

diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index 26017018aafc2f3c2e9069721cc773057e6b3f8c..8781de893d794176a4dd610252bee8f4c9769fea 100644 (file)
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -117,7 +117,7 @@ function loadRemoteSearchProviders(callback) {
         }
     }
 
-    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
+    let searchSettings = new Gio.Settings({ schema_id: Search.SEARCH_PROVIDERS_SCHEMA });
     if (searchSettings.get_boolean('disable-external')) {
         callback([]);
         return;

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 10cae4c36881cd0f514a5180b2093b52695b8880..faf16891d5821371b1513028ccbf86be2774fe37 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -38,8 +38,8 @@ const RunDialog = new Lang.Class({
         this.parent({ styleClass: 'run-dialog',
                       destroyOnClose: false });
 
-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+        this._terminalSettings = new Gio.Settings({ schema_id: TERMINAL_SCHEMA });
         global.settings.connect('changed::development-tools', Lang.bind(this, function () {
             this._enableInternalCommands = global.settings.get_boolean('development-tools');
         }));

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 02098468358577408830263f936a0cf8980411a9..fe00c2ddca4f8d7caa0368449ecd620fb94c8405 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -563,7 +563,7 @@ const ScreenShield = new Lang.Class({
                 this._loginSession.connectSignal('Unlock', Lang.bind(this, function() { this.deactivate(false); }));
             }));
 
-        this._settings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
 
         this._isModal = false;
         this._hasLockScreen = false;

diff --git a/js/ui/search.js b/js/ui/search.js
index 3797b74219de1eaa179a2044e05f44cd59b843d4..9a58e79817205b0ea3ca1e5698bd3cfa4bfc7076 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -31,7 +31,7 @@ const SearchSystem = new Lang.Class({
 
         this._registerProvider(new AppDisplay.AppSearchProvider());
 
-        this._searchSettings = new Gio.Settings({ schema: SEARCH_PROVIDERS_SCHEMA });
+        this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA });
         this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
         this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
         this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index efcb6526712b8468a894faaf81ef17a21b270382..5047a2863ab2287be612f0d48165347eecef5ade 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -48,7 +48,7 @@ const ATIndicator = new Lang.Class({
 
         this.actor.add_child(this._hbox);
 
-        this._a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
+        this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
         this._a11ySettings.connect('changed::' + KEY_ALWAYS_SHOW, Lang.bind(this, this._queueSyncMenuVisibility));
 
         let highContrast = this._buildHCItem();
@@ -118,7 +118,7 @@ const ATIndicator = new Lang.Class({
     },
 
     _buildItem: function(string, schema, key) {
-        let settings = new Gio.Settings({ schema: schema });
+        let settings = new Gio.Settings({ schema_id: schema });
         let widget = this._buildItemExtended(string,
             settings.get_boolean(key),
             settings.is_writable(key),
@@ -134,8 +134,8 @@ const ATIndicator = new Lang.Class({
     },
 
     _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema: WM_SCHEMA });
+        let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        let wmSettings = new Gio.Settings({ schema_id: WM_SCHEMA });
         let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
         let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
         let wmTheme = wmSettings.get_string(KEY_WM_THEME);
@@ -186,7 +186,7 @@ const ATIndicator = new Lang.Class({
     },
 
     _buildFontItem: function() {
-        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
 
         let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
         let initial_setting = (factor > 1.0);

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index fc37ba077e804298aae4b2d40df92ad85cb0f823..e4bd2107c9bd5749fc2547d5780d9283516e11fd 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -365,18 +365,18 @@ const InputSourceIndicator = new Lang.Class({
         this._mruSources = [];
         this._keybindingAction =
             Main.wm.addKeybinding('switch-input-source',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
+                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES,
                                   Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._keybindingActionBackward =
             Main.wm.addKeybinding('switch-input-source-backward',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
+                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES |
                                   Meta.KeyBindingFlags.IS_REVERSED,
                                   Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
-        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: DESKTOP_INPUT_SOURCES_SCHEMA });
         this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
         this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
 

diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index 581a53440206234202f2e2274a6d09de6b052ef5..15b5f80cbda24f5d94fc0c42edcbdff1b05e2dc3 100644 (file)
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -43,7 +43,7 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._settings = new Gio.Settings({ schema: LOCATION_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: LOCATION_SCHEMA });
         this._settings.connect('changed::' + MAX_ACCURACY_LEVEL,
                                Lang.bind(this, this._onMaxAccuracyLevelChanged));
 

diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index b36c9d18ae43a82bdac2f61c9dbb4fdb68ce7183..51b511841a67e329e1a77f94066967398a5d7369 100644 (file)
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -95,11 +95,11 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
-        this._loginScreenSettings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
-        this._orientationSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.peripherals.touchscreen' });
+        this._screenSaverSettings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+        this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+        this._privacySettings = new Gio.Settings({ schema_id: PRIVACY_SCHEMA });
+        this._orientationSettings = new Gio.Settings({ schema_id: 'org.gnome.settings-daemon.peripherals.touchscreen' });
 
         this._session = new GnomeSession.SessionManager();
         this._loginManager = LoginManager.getLoginManager();

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 06966a30f9f7b746641f9499da4da32f8532cfc6..a7f2c6f4bbf58f69d30defce39a6089f2d19ad6e 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -62,7 +62,7 @@ const UnlockDialog = new Lang.Class({
 
         this.allowCancel = false;
 
-        let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
+        let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
         if (screenSaverSettings.get_boolean('user-switch-enabled')) {
             let otherUserLabel = new St.Label({ text: _("Log in as another user"),
                                                 style_class: 'login-dialog-not-listed-label' });

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index bc157dcdbd977f243a7f12524fa3eb8b8e3edd7f..550510b06186c5dfaa348817984732f82de9dd51 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -132,14 +132,14 @@ const ViewSelector = new Lang.Class({
             }));
 
         Main.wm.addKeybinding('toggle-application-view',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
                               Shell.KeyBindingMode.NORMAL |
                               Shell.KeyBindingMode.OVERVIEW,
                               Lang.bind(this, this._toggleAppsPage));
 
         Main.wm.addKeybinding('toggle-overview',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
                               Shell.KeyBindingMode.NORMAL |
                               Shell.KeyBindingMode.OVERVIEW,

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index c2a2d133f656fbd1aa6aa0c9626f6a428d66d926..bca0466c05bfade0158c5877651511d6c186b603 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -209,7 +209,7 @@ const WorkspaceTracker = new Lang.Class({
         let settings = global.get_overrides_settings();
         if (settings.list_keys().indexOf('dynamic-workspaces') > -1)
             return settings;
-        return new Gio.Settings({ schema: 'org.gnome.mutter' });
+        return new Gio.Settings({ schema_id: 'org.gnome.mutter' });
     },
 
     _checkWorkspaces: function() {
@@ -655,13 +655,13 @@ const WindowManager = new Lang.Class({
                                         Lang.bind(this, this._startA11ySwitcher));
 
         this.addKeybinding('pause-resume-tweens',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
                            Shell.KeyBindingMode.ALL,
                            Lang.bind(this, this._toggleTweens));
 
         this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
                            Shell.KeyBindingMode.NORMAL |
                            Shell.KeyBindingMode.TOPBAR_POPUP,

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index b1bc7cb49026c287ccad07f853234888c6053c7e..14091a557e66c5ef41aea25acf3b064d5e587825 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -665,7 +665,7 @@ const ThumbnailsBox = new Lang.Class({
         Main.overview.connect('window-drag-cancelled',
                               Lang.bind(this, this._onDragCancelled));
 
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
         this._settings.connect('changed::dynamic-workspaces',
             Lang.bind(this, this._updateSwitcherVisibility));
     },

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 59e968275ec6a41955d4202080200d90e72ba085..5af58981df047ba6594e20e142dbd85e322952b8 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -94,7 +94,7 @@ const WorkspacesView = new Lang.Class({
         this._scrolling = false; // swipe-scrolling
         this._animatingScroll = false; // programatically updating the adjustment
 
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
 
         let activeWorkspaceIndex = global.screen.get_active_workspace_index();
         this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -429,7 +429,7 @@ const WorkspacesDisplay = new Lang.Class({
         this._workspacesViews = [];
         this._primaryScrollAdjustment = null;
 
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
         this._settings.connect('changed::workspaces-only-on-primary',
                                Lang.bind(this,
                                          this._workspacesOnlyOnPrimaryChanged));